From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 4 Nov 2013 13:06:33 +0000 (+0100)
Subject: screencast: Fix disabling screencasts via session mode
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3079
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9520e87a384cb5cfaa5099e05931f8a3b77e6d33;p=gnome-shell.git

screencast: Fix disabling screencasts via session mode

If screencasts are disabled, we return a DBus error, but still start
the recording happily - add early returns in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=699752
---

diff --git a/js/ui/screencast.js b/js/ui/screencast.js
index a1593b254..23d6a4269 100644
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@@ -105,8 +105,10 @@ const ScreencastService = new Lang.Class({
 
     ScreencastAsync: function(params, invocation) {
         let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast)
+        if (!Main.sessionMode.allowScreencast) {
             invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
 
         let sender = invocation.get_sender();
         let recorder = this._ensureRecorderForSender(sender);
@@ -124,8 +126,10 @@ const ScreencastService = new Lang.Class({
 
     ScreencastAreaAsync: function(params, invocation) {
         let returnValue = [false, ''];
-        if (!Main.sessionMode.allowScreencast)
+        if (!Main.sessionMode.allowScreencast) {
             invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
 
         let sender = invocation.get_sender();
         let recorder = this._ensureRecorderForSender(sender);